91d220b350f512ef283748dfcbcc304bde2f9db2,src/java/org/apache/cassandra/tools/NodeCmd.java,ClusterStatus,print,#,541

Before Change



            try
            {
                ownerships = new SetHostStat(probe.effectiveOwnership(kSpace));
                hasEffectiveOwns = true;
            }
            catch (IllegalStateException e)
            {
                ownerships = new SetHostStat(probe.getOwnership());
            }

            // More tokens then nodes (aka vnodes)?
            if (new HashSet<String>(tokensToEndpoints.values()).size() < tokensToEndpoints.keySet().size())
                isTokenPerNode = false;

            Map<String, SetHostStat> dcs = getOwnershipByDc(ownerships);

            findMaxAddressLength(dcs);

            // Datacenters
            for (Map.Entry<String, SetHostStat> dc : dcs.entrySet())
            {
                String dcHeader = String.format("Datacenter: %s%n", dc.getKey());
                outs.printf(dcHeader);
                for (int i=0; i < (dcHeader.length() - 1); i++) outs.print('=');
                outs.println();

                printStatusLegend();
                printNodesHeader(hasEffectiveOwns, isTokenPerNode);

                // Nodes
                for (HostStat entry : dc.getValue())
                    printNode(entry, hasEffectiveOwns, isTokenPerNode);
            }
        }

After Change



            try
            {
                ownerships = probe.effectiveOwnership(kSpace);
                hasEffectiveOwns = true;
            }
            catch (IllegalStateException e)
            {
                ownerships = probe.getOwnership();
            }

            // More tokens then nodes (aka vnodes)?
            if (tokensToEndpoints.values().size() < tokensToEndpoints.keySet().size())
                isTokenPerNode = false;

            Map<String, SetHostStat> dcs = getOwnershipByDc(resolveIp, tokensToEndpoints, ownerships);

            findMaxAddressLength(dcs);

            // Datacenters
            for (Map.Entry<String, SetHostStat> dc : dcs.entrySet())
            {
                String dcHeader = String.format("Datacenter: %s%n", dc.getKey());
                outs.printf(dcHeader);
                for (int i=0; i < (dcHeader.length() - 1); i++) outs.print('=');
                outs.println();

                printStatusLegend();
                printNodesHeader(hasEffectiveOwns, isTokenPerNode);

                ArrayListMultimap<String, String> hostToTokens = ArrayListMultimap.create();
                for (HostStat stat : dc.getValue())
                    hostToTokens.put(stat.ipOrDns(), stat.token);

                // Nodes